Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

initial refactoring to match SMaHT portal changes #1

Merged
merged 18 commits into from
Dec 4, 2023
Merged

initial refactoring to match SMaHT portal changes #1

merged 18 commits into from
Dec 4, 2023

Conversation

B3rse
Copy link

@B3rse B3rse commented Oct 19, 2023

In this PR we are adding the necessary changes to accommodate the updated schemas and QC infrastructure for the SMaHT portal

Copy link

@willronchetti willronchetti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some small comments, will approve once we iron these things out

pipeline_utils/__main__.py Outdated Show resolved Hide resolved
frmt_json[self.DESCRIPTION_SCHEMA] = self.description
frmt_json[self.STANDARD_FILE_EXTENSION_SCHEMA] = self.extension
frmt_json[self.VALID_ITEM_TYPES_SCHEMA] = getattr(self, self.FILE_TYPES_SCHEMA, ['FileReference', 'FileProcessed'])
frmt_json[self.EXTRAFILE_FORMATS_SCHEMA] = getattr(self, self.SECONDARY_FORMATS_SCHEMA, [])
# frmt_json[self.VALID_ITEM_TYPES_SCHEMA] = getattr(self, self.FILE_TYPES_SCHEMA, ['FileReference', 'FileProcessed'])

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should still be needed no?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doug wants to try and remove this, I did comment it out for now

schema.PATTERN: 'FileReference|FileProcessed|FileSubmitted|FileFastq'
}
},
# 'file_types': {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this removed? I still see it in the schema on Doug's branch?

@@ -12,11 +12,15 @@ secondary_files:
status: uploading
uuid: 1936f246-22e1-45dc-bb5c-9cfd55537fe7
accession: GAPFIXRDPDK5
category: Sequencing Reads

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You might want to make this an enum portal side so we can control these values, could get messy with time especially if we have these coming from external submitters

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that is the plan and is already an enum

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if not we definitely should

tests/test_yaml_file_format.py Show resolved Hide resolved
tests/test_yaml_metaworkflow.py Show resolved Hide resolved
@B3rse B3rse merged commit 49763a2 into main Dec 4, 2023
3 checks passed
@B3rse B3rse deleted the smaht branch December 4, 2023 21:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants